Only undef gtk_init_check and gtk_init on win32.

Mon Aug  9 11:49:46 2004  Matthias Clasen  <maclas@gmx.de>

	* gtk/gtkmain.c: Only undef gtk_init_check and gtk_init on win32.

diff --git a/ChangeLog b/ChangeLog
index 075aabaf200d3273949d9ca05629b6ebababe60a..a16fe57ce570b9fb740ce26a2546d894c654a441 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Aug  9 11:49:46 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkmain.c: Only undef gtk_init_check and gtk_init on win32.
+
 Mon Aug  9 10:50:05 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkentry.h: Add gtk_entry_layout_index_to_text_index() 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 075aabaf200d3273949d9ca05629b6ebababe60a..a16fe57ce570b9fb740ce26a2546d894c654a441 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,7 @@
+Mon Aug  9 11:49:46 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkmain.c: Only undef gtk_init_check and gtk_init on win32.
+
 Mon Aug  9 10:50:05 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkentry.h: Add gtk_entry_layout_index_to_text_index() 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 075aabaf200d3273949d9ca05629b6ebababe60a..a16fe57ce570b9fb740ce26a2546d894c654a441 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,7 @@
+Mon Aug  9 11:49:46 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkmain.c: Only undef gtk_init_check and gtk_init on win32.
+
 Mon Aug  9 10:50:05 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkentry.h: Add gtk_entry_layout_index_to_text_index() 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 075aabaf200d3273949d9ca05629b6ebababe60a..a16fe57ce570b9fb740ce26a2546d894c654a441 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,7 @@
+Mon Aug  9 11:49:46 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkmain.c: Only undef gtk_init_check and gtk_init on win32.
+
 Mon Aug  9 10:50:05 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkentry.h: Add gtk_entry_layout_index_to_text_index() 

diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index 38e77e06a5431eb997c727cf995ffed6a952e30d..6d06ff6d683fb9edac5cdfd305fd0afea493cf39 100644 (file)
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -609,7 +609,9 @@ gtk_disable_setlocale (void)
   do_setlocale = FALSE;
 }
 
+#ifdef G_PLATFORM_WIN32
 #undef gtk_init_check
+#endif
 
 static void
 default_display_notify_cb (GdkDisplayManager *display_manager)
@@ -891,7 +893,9 @@ gtk_parse_args (int    *argc,
   return TRUE;
 }
 
+#ifdef G_PLATFORM_WIN32
 #undef gtk_init_check
+#endif
 
 /**
  * gtk_init_check:
@@ -920,7 +924,9 @@ gtk_init_check (int  *argc,
   return gdk_display_open_default_libgtk_only () != NULL;
 }
 
+#ifdef G_PLATFORM_WIN32
 #undef gtk_init
+#endif
 
 /**
  * gtk_init: